Produced by Araxis Merge on 2021-05-13 09:08:59 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/General | Notice.php | 2019-11-06 10:03:26 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/Model/Config/Settings/General | Notice.php | 2019-11-06 10:03:26 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 1 | 46 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <?php | 1 | <?php | |||
| 2 | namespace Smartwave\Porto\Model\Config\Settings\General; | 2 | namespace Smartwave\Porto\Model\Config\Settings\General; | |||
| 3 | 3 | |||||
| 4 | class Notice implements \Magento\Framework\Option\ArrayInterface | 4 | class Notice implements \Magento\Framework\Option\ArrayInterface | |||
| 5 | { | 5 | { | |||
| 6 | public function toOptionArray() | 6 | public function toOptionArray() | |||
| 7 | { | 7 | { | |||
| 8 | return [ | 8 | return [ | |||
| 9 | ['value' => '', 'label' => __('No')], | 9 | ['value' => '', 'label' => __('No')], | |||
| 10 | ['value' => '1', 'label' => __('Above of the Header')], | 10 | ['value' => '1', 'label' => __('Above of the Header')], | |||
| 11 | ['value' => '2', 'label' => __('Below of the Header')] | 11 | ['value' => '2', 'label' => __('Below of the Header')] | |||
| 12 | ]; | 12 | ]; | |||
| 13 | } | 13 | } | |||
| 14 | 14 | |||||
| 15 | public function toArray() | 15 | public function toArray() | |||
| 16 | { | 16 | { | |||
| 17 | return [ | 17 | return [ | |||
| 18 | '' => __('No'), | 18 | '' => __('No'), | |||
| 19 | '1' => __('Above of the Header'), | 19 | '1' => __('Above of the Header'), | |||
| 20 | '2' => __('Below of the Header') | 20 | '2' => __('Below of the Header') | |||
| 21 | ]; | 21 | ]; | |||
| 22 | } | 22 | } | |||
| 23 | } | 23 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.